ozi: Commit ozi time-format change (SF 1760287: OziExplorer Date precision).

Recreate reference data.

diff --git a/ozi.c b/ozi.c
index 514cdcfc73530643d1744bde0d6d8c2dd32f0220..fa4a86509fad18cff07e025cb28ba6e8814e39d1 100644 (file)
--- a/ozi.c
+++ b/ozi.c
@@ -24,11 +24,13 @@
 
 #include "defs.h"
 #include "csv_util.h"
+#include "jeeps/gpsmath.h"
 #include <ctype.h>
 #include <math.h>                /* for floor */
 
 #define MYNAME        "OZI"
-#define BADCHARS       ",\n"
+#define BADCHARS       ",\r\n"
+#define DAYS_SINCE_1990        25569
 
 typedef struct {
        format_specific_data fs;
@@ -54,8 +56,7 @@ static char *snuniqueopt = NULL;
 static char *wptfgcolor = NULL;
 static char *wptbgcolor = NULL;
 static char *pack_opt = NULL;
-
-
+static int datum;
 
 static
 arglist_t ozi_args[] = {
@@ -112,6 +113,54 @@ ozi_alloc_fsdata(void)
        return fsdata;
 }
 
+void
+ozi_get_time_str(const waypoint *waypointp, char *buff, gbsize_t buffsz)
+{
+       if (waypointp->creation_time) {
+           double time = (waypt_time(waypointp) / SECONDS_PER_DAY) + DAYS_SINCE_1990;
+           snprintf(buff, buffsz, "%.7f", time);
+       }
+       else *buff = '\0';
+}
+
+void
+ozi_set_time_str(const char *str, waypoint *waypointp)
+{
+       double ozi_time;
+       char *dot;
+       int len;
+
+       ozi_time = atof(str);
+       waypointp->creation_time = (ozi_time - DAYS_SINCE_1990) * SECONDS_PER_DAY;
+
+       dot = strchr(str, '.');
+       /* get number of characters after dot */
+       len = (dot) ? strlen(str) - (dot - str) - 1 : 0;
+       if (len >= 7) {
+           /* with default ozi time precision (%.7f) we can only handle tenths of second */
+           ozi_time -= ((double)waypointp->creation_time / SECONDS_PER_DAY ) + DAYS_SINCE_1990;
+           ozi_time *= SECONDS_PER_DAY;
+           waypointp->microseconds = (ozi_time * 10) + 0.5;
+           if (waypointp->microseconds == 10) {
+               waypointp->creation_time++;
+               waypointp->microseconds = 0;
+           }
+           waypointp->microseconds *= 100000;
+       }
+}
+
+static void
+ozi_convert_datum(waypoint *wpt)
+{
+    if (datum != DATUM_WGS84) {
+       double lat, lon, alt;
+       GPS_Math_Known_Datum_To_WGS84_M(wpt->latitude, wpt->longitude, 0.0, 
+           &lat, &lon, &alt, datum);
+       wpt->latitude = lat;
+       wpt->longitude = lon;
+    }
+}
+
 static void
 ozi_openfile(char *fname) {
     char *c, *cx, *tmpname;
@@ -180,9 +229,9 @@ static void
 ozi_track_disp(const waypoint * waypointp)
 {
     double alt_feet;
-    double ozi_time;
+    char ozi_time[16];
 
-    ozi_time = (waypointp->creation_time / 86400.0) + 25569.0;
+    ozi_get_time_str(waypointp, ozi_time, sizeof(ozi_time));
 
     if (waypointp->altitude == unknown_alt) {
         alt_feet = -777;
@@ -190,7 +239,7 @@ ozi_track_disp(const waypoint * waypointp)
         alt_feet = METERS_TO_FEET(waypointp->altitude);
     }
 
-    gbfprintf(file_out, "%.6f,%.6f,%d,%.0f,%.5f,,\r\n",
+    gbfprintf(file_out, "%.6f,%.6f,%d,%.0f,%s,,\r\n",
                waypointp->latitude, waypointp->longitude, new_track, 
        alt_feet, ozi_time);
 
@@ -248,11 +297,11 @@ static void
 ozi_route_disp(const waypoint * waypointp)
 {
     double alt_feet;
-    double ozi_time;
+    char ozi_time[16];
 
     route_wpt_count++;
 
-    ozi_time = (waypointp->creation_time / 86400.0) + 25569.0;
+    ozi_get_time_str(waypointp, ozi_time, sizeof(ozi_time));
 
     if (waypointp->altitude == unknown_alt) {
         alt_feet = -777;
@@ -281,7 +330,7 @@ ozi_route_disp(const waypoint * waypointp)
  * W,1,7,7,007,-25.581670,-48.316660,36564.54196,10,1,4,0,65535,TR ILHA GALHETA,0,0 
  */
 
-    gbfprintf(file_out, "W,%d,%d,,%s,%.6f,%.6f,%.5f,0,1,3,0,65535,%s,0,0\r\n", 
+    gbfprintf(file_out, "W,%d,%d,,%s,%.6f,%.6f,%s,0,1,3,0,65535,%s,0,0\r\n", 
             route_out_count,
             route_wpt_count,
             waypointp->shortname ? waypointp->shortname : "",
@@ -369,6 +418,8 @@ ozi_parse_waypt(int field, char *str, waypoint * wpt_tmp, ozi_fsdata *fsdata)
 {
     double alt;
 
+    if (*str == '\0') return;
+
     switch (field) {
     case 0:
         /* sequence # */
@@ -387,7 +438,7 @@ ozi_parse_waypt(int field, char *str, waypoint * wpt_tmp, ozi_fsdata *fsdata)
         break;
     case 4:
         /* DAYS since 1900 00:00:00 in days.days (5.5) */
-        wpt_tmp->creation_time = (atof(str) - 25569.0) * 86400.0;
+       ozi_set_time_str(str, wpt_tmp);
         break;
     case 5:
         /* icons 0-xx */
@@ -453,6 +504,8 @@ ozi_parse_track(int field, char *str, waypoint * wpt_tmp)
 {
     double alt;
 
+    if (*str == '\0') return;
+    
     switch (field) {
     case 0:
         /* latitude */
@@ -463,7 +516,11 @@ ozi_parse_track(int field, char *str, waypoint * wpt_tmp)
         wpt_tmp->longitude = atof(str);
         break;
     case 2:
-        /* ignore */
+        /* new track flag */
+       if ((atoi(str) == 1) && (trk_head->rte_waypt_ct > 0)) {
+           trk_head = route_head_alloc();
+           track_add_head(trk_head);
+       }
         break;
     case 3:
         /* altitude in feet */
@@ -476,7 +533,7 @@ ozi_parse_track(int field, char *str, waypoint * wpt_tmp)
         break;
     case 4:
         /* DAYS since 1900 00:00:00 in days.days (5.5) */
-        wpt_tmp->creation_time = (atof(str) - 25569.0) * 86400.0;
+       ozi_set_time_str(str, wpt_tmp);
         break;
     default:
         break;
@@ -486,6 +543,7 @@ ozi_parse_track(int field, char *str, waypoint * wpt_tmp)
 static void
 ozi_parse_routepoint(int field, char *str, waypoint * wpt_tmp)
 {
+    if (*str == '\0') return;
 
     switch (field) {
     case 0:
@@ -514,7 +572,7 @@ ozi_parse_routepoint(int field, char *str, waypoint * wpt_tmp)
         break;
     case 7:
         /* DAYS since 1900 00:00:00 in days.days (5.5) */
-        wpt_tmp->creation_time = (atof(str) - 25569.0) * 86400.0;
+       ozi_set_time_str(str, wpt_tmp);
         break;
     case 8:
         /* symbol */
@@ -598,10 +656,10 @@ data_read(void)
                 ozi_objective = wptdata;
             }
         }
-
-        if (linecount == 2) {
-           if (case_ignore_strncmp(buff, "WGS 84", 6)) {
-               warning(MYNAME "Only supports reading WGS 84 datum, not '%s'\n", buff);
+       else if (linecount == 2) {
+           datum = GPS_Lookup_Datum_Index(buff);
+           if (datum < 0) {
+               fatal(MYNAME ": Unsupported datum '%s'.\n", buff);
            }
        }
 
@@ -640,14 +698,18 @@ data_read(void)
 
             switch (ozi_objective) {
             case trkdata:
-                if (linecount > 6) /* skipping over file header */
-                    track_add_wpt(trk_head, wpt_tmp);
+                if (linecount > 6) {/* skipping over file header */
+                   ozi_convert_datum(wpt_tmp);
+                   track_add_wpt(trk_head, wpt_tmp);
+               }
                 else
                     waypt_free(wpt_tmp);
                 break;
             case rtedata:
-                if (linecount > 5) /* skipping over file header */
+                if (linecount > 5) {/* skipping over file header */
+                   ozi_convert_datum(wpt_tmp);
                     route_add_wpt(rte_head, wpt_tmp);
+               }
                 else
                     waypt_free(wpt_tmp);
                 break;
@@ -655,6 +717,7 @@ data_read(void)
                 if (linecount > 4) {  /* skipping over file header */ 
                    fs_chain_add(&(wpt_tmp->fs), 
                        (format_specific_data *) fsdata);
+                   ozi_convert_datum(wpt_tmp);
                     waypt_add(wpt_tmp);
                 } else {
                     waypt_free(wpt_tmp);
@@ -677,7 +740,7 @@ ozi_waypt_pr(const waypoint * wpt)
 {
     static int index = 0;
     double alt_feet;
-    double ozi_time;
+    char ozi_time[16];
     char *description;
     char *shortname;
     int faked_fsdata = 0;
@@ -690,7 +753,7 @@ ozi_waypt_pr(const waypoint * wpt)
        faked_fsdata = 1;
     }
 
-    ozi_time = (wpt->creation_time / 86400.0) + 25569.0;
+    ozi_get_time_str(wpt, ozi_time, sizeof(ozi_time));
 
     if (wpt->altitude == unknown_alt) {
         alt_feet = -777;
@@ -725,7 +788,7 @@ ozi_waypt_pr(const waypoint * wpt)
     index++;
 
     gbfprintf(file_out,
-            "%d,%s,%.6f,%.6f,%.5f,%d,%d,%d,%d,%d,%s,%d,%d,",
+            "%d,%s,%.6f,%.6f,%s,%d,%d,%d,%d,%d,%s,%d,%d,",
             index, shortname, wpt->latitude, wpt->longitude, ozi_time, 0,
             1, 3, fs->fgcolor, fs->bgcolor, description, 0, 0);
     if (WAYPT_HAS(wpt, proximity) && (wpt->proximity > 0))

diff --git a/reference/ozi.wpt b/reference/ozi.wpt
index 5b3f02df721386585495a3f48e0282aa4920ed74..ffe172c0b5f71cbaefecc0de8c103122d6b3ab85 100644 (file)
--- a/reference/ozi.wpt
+++ b/reference/ozi.wpt
@@ -2,12 +2,12 @@ OziExplorer Waypoint File Version 1.1
 WGS 84\r
 Reserved 2\r
 Reserved 3\r
-1,GCEBB,35.972033,-87.134700,25569.00000,0,1,3,0,65535,Mountain Bike Heaven by susy1313,0,0,0,0,6,0,17\r
-2,GC1A37,36.090683,-86.679550,25569.00000,0,1,3,0,65535,The Troll by a182pilot & Family,0,0,0,0,6,0,17\r
-3,GC1C2B,35.996267,-86.620117,25569.00000,0,1,3,0,65535,Dive Bomber by JoGPS & family,0,0,0,0,6,0,17\r
-4,GC25A9,36.038483,-86.648617,25569.00000,0,1,3,0,65535,FOSTER by JoGPS & Family,0,0,0,0,6,0,17\r
-5,GC2723,36.112183,-86.741767,25569.00000,0,1,3,0,65535,Logan Lighthouse by JoGps & Family,0,0,0,0,6,0,17\r
-6,GC2B71,36.064083,-86.790517,25569.00000,0,1,3,0,65535,Ganier Cache by Susy1313,0,0,0,0,6,0,17\r
-7,GC309F,36.087767,-86.809733,25569.00000,0,1,3,0,65535,Shy's Hill by FireFighterEng33,0,0,0,0,6,0,17\r
-8,GC317A,36.057500,-86.892000,25569.00000,0,1,3,0,65535,GittyUp by JoGPS / Warner Parks,0,0,0,0,6,0,17\r
-9,GC317D,36.082800,-86.867283,25569.00000,0,1,3,0,65535,Inlighting by JoGPS / Warner Parks,0,0,0,0,6,0,17\r
+1,GCEBB,35.972033,-87.134700,,0,1,3,0,65535,Mountain Bike Heaven by susy1313,0,0,0,0,6,0,17\r
+2,GC1A37,36.090683,-86.679550,,0,1,3,0,65535,The Troll by a182pilot & Family,0,0,0,0,6,0,17\r
+3,GC1C2B,35.996267,-86.620117,,0,1,3,0,65535,Dive Bomber by JoGPS & family,0,0,0,0,6,0,17\r
+4,GC25A9,36.038483,-86.648617,,0,1,3,0,65535,FOSTER by JoGPS & Family,0,0,0,0,6,0,17\r
+5,GC2723,36.112183,-86.741767,,0,1,3,0,65535,Logan Lighthouse by JoGps & Family,0,0,0,0,6,0,17\r
+6,GC2B71,36.064083,-86.790517,,0,1,3,0,65535,Ganier Cache by Susy1313,0,0,0,0,6,0,17\r
+7,GC309F,36.087767,-86.809733,,0,1,3,0,65535,Shy's Hill by FireFighterEng33,0,0,0,0,6,0,17\r
+8,GC317A,36.057500,-86.892000,,0,1,3,0,65535,GittyUp by JoGPS / Warner Parks,0,0,0,0,6,0,17\r
+9,GC317D,36.082800,-86.867283,,0,1,3,0,65535,Inlighting by JoGPS / Warner Parks,0,0,0,0,6,0,17\r